Rebase patch for new upstream release
authorMatthias Geiger <werdahias@debian.org>
Mon, 1 Sep 2025 16:25:43 +0000 (18:25 +0200)
committerMatthias Geiger <werdahias@debian.org>
Mon, 1 Sep 2025 16:25:43 +0000 (18:25 +0200)
debian/patches/use-unicode-data.patch

index f0349820ab83257e8fe6125e62cf3c9066dc7052..fec278added9e06b5fad1b1f596a22b1ceaf54e7 100644 (file)
@@ -3,15 +3,16 @@ Description: Use unicode-data instead of downloading external files
  provided by the packages unicode-data and ttf-unifont, respectively.
 Author: Peter Colberg <peter@colberg.org>
 Forwarded: not-needed
-Last-Update: 2021-12-22
+Last-Update: 2025-09-01
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: utf8proc/data/Makefile
-===================================================================
---- utf8proc.orig/data/Makefile
-+++ utf8proc/data/Makefile
-@@ -25,37 +25,37 @@ CharWidths.txt: charwidths.jl EastAsianW
- UNICODE_VERSION=15.1.0
+
+diff --git a/data/Makefile b/data/Makefile
+index aa2d8a7..24d09ac 100644
+--- a/data/Makefile
++++ b/data/Makefile
+@@ -24,37 +24,37 @@ utf8proc_data.c.new: data_generator.jl $(RAWDATA)
+ UNICODE_VERSION=16.0.0
  
  UnicodeData.txt:
 -      $(CURL) $(CURLFLAGS) -o $@ https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt
@@ -50,12 +51,13 @@ Index: utf8proc/data/Makefile
 +      cp /usr/share/unicode/emoji/emoji-data.txt $@
  
  Uppercase.txt: DerivedCoreProperties.txt
--      $(RUBY) -e 'puts File.read("DerivedCoreProperties.txt")[/# Derived Property: Uppercase.*?# Total code points:/m]' > $@
+-      $(JULIA) -e 'print(match(r"# Derived Property: Uppercase.*?# Total code points:"s, read("DerivedCoreProperties.txt", String)).match)' > $@
 +      grep -zoP '(?s)# Derived Property: Uppercase.*?# Total code points:' DerivedCoreProperties.txt > $@
  
  Lowercase.txt: DerivedCoreProperties.txt
--      $(RUBY) -e 'puts File.read("DerivedCoreProperties.txt")[/# Derived Property: Lowercase.*?# Total code points:/m]' > $@
+-      $(JULIA) -e 'print(match(r"# Derived Property: Lowercase.*?# Total code points:"s, read("DerivedCoreProperties.txt", String)).match)' > $@
 +      grep -zoP '(?s)# Derived Property: Lowercase.*?# Total code points:' DerivedCoreProperties.txt > $@
  
  clean:
-       rm -f UnicodeData.txt EastAsianWidth.txt GraphemeBreakProperty.txt DerivedCoreProperties.txt CompositionExclusions.txt CaseFolding.txt NormalizationTest.txt GraphemeBreakTest.txt CharWidths.txt emoji-data.txt
+       rm -f $(RAWDATA) NormalizationTest.txt GraphemeBreakTest.txt
+